From 117b719816f7c3bcd6bf8c4342f16698b3bab059 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Tue, 8 Jul 2014 10:46:39 +0200 Subject: [PATCH] Adwaita: selection menu button style fixes --- gtk/resources/theme/Adwaita/_common.scss | 14 +++++++++----- .../theme/Adwaita/gtk-contained-dark.css | 15 +++++++++++---- gtk/resources/theme/Adwaita/gtk-contained.css | 15 +++++++++++---- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 19fc3d7e17..21eed132f7 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -777,9 +777,16 @@ GtkComboBox { } } .selection-menu { - border-width: 0; - background-image: none; + border-color: transparentize($selected_bg_color,1); + background-image: linear-gradient(to bottom, transparentize($selected_bg_color,1)); box-shadow: none; + &:hover { + $_hover_color: lighten($selected_bg_color,9%); + border-color: $_hover_color; + background-image: linear-gradient(to bottom, $_hover_color); + box-shadow: 0 1px transparentize(black,0.85); + } + &:backdrop, &:backdrop:hover { @extend .selection-menu }; } } .tiled &, .maximized & { @@ -1220,9 +1227,6 @@ GtkTreeView.view.progressbar { //Progressbar in treeview cells } } -//.notebook > .frame, -//.notebook > .view { border: none; } - /************** * Scrollbars * **************/ diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index be41944ae6..6939b94a48 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -973,11 +973,18 @@ GtkComboBox { background-image: linear-gradient(to bottom, #393f3f); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } - .titlebar.selection-mode .selection-menu, - .header-bar.selection-mode .selection-menu { - border-width: 0; - background-image: none; + .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop, .titlebar.selection-mode .selection-menu:backdrop:hover, + .header-bar.selection-mode .selection-menu, + .header-bar.selection-mode .selection-menu:backdrop, + .header-bar.selection-mode .selection-menu:backdrop:hover { + border-color: rgba(33, 93, 156, 0); + background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0)); box-shadow: none; } + .titlebar.selection-mode .selection-menu:hover, + .header-bar.selection-mode .selection-menu:hover { + border-color: #2974c2; + background-image: linear-gradient(to bottom, #2974c2); + box-shadow: 0 1px rgba(0, 0, 0, 0.15); } .tiled .titlebar, .maximized .titlebar, .tiled .header-bar, .maximized .header-bar { diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 46e6cd3dc5..64cb70212c 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -965,11 +965,18 @@ GtkComboBox { background-image: linear-gradient(to bottom, #ededed); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } - .titlebar.selection-mode .selection-menu, - .header-bar.selection-mode .selection-menu { - border-width: 0; - background-image: none; + .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop, .titlebar.selection-mode .selection-menu:backdrop:hover, + .header-bar.selection-mode .selection-menu, + .header-bar.selection-mode .selection-menu:backdrop, + .header-bar.selection-mode .selection-menu:backdrop:hover { + border-color: rgba(74, 144, 217, 0); + background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0)); box-shadow: none; } + .titlebar.selection-mode .selection-menu:hover, + .header-bar.selection-mode .selection-menu:hover { + border-color: #70a7e1; + background-image: linear-gradient(to bottom, #70a7e1); + box-shadow: 0 1px rgba(0, 0, 0, 0.15); } .tiled .titlebar, .maximized .titlebar, .tiled .header-bar, .maximized .header-bar { -- 2.30.2